Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 28 May 2010 11:27:13 +0000 (11:27 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 28 May 2010 11:27:13 +0000 (11:27 +0000)

Trivial merge